From 54d236df374ed462a1436e5709f31546fa10f9c6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 8 Mar 2019 06:00:16 +0100 Subject: [PATCH] SVN_SILENT made messages (.desktop file) - always resolve ours 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" --- effects/dimscreen/package/metadata.desktop | 2 ++ effects/showpaint/showpaint_config.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/effects/dimscreen/package/metadata.desktop b/effects/dimscreen/package/metadata.desktop index 4252178529..16d1bc3871 100644 --- a/effects/dimscreen/package/metadata.desktop +++ b/effects/dimscreen/package/metadata.desktop @@ -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[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[ja]=root 権限が要求されるとスクリーン全体を暗くします Comment[kk]=root құқығын сұрағанда бүкіл экранды күңгірттеу Comment[km]=ធ្វើ​ឲ្យ​អេក្រង់ទាំងមូល​ងងឹត​នៅពេល​បង្ហាញ​សិទ្ធិជា​ root Comment[kn]=ನಿರ್ವಾಹಕ ಸವಲತ್ತುಗಳನ್ನು ಕೇಳುವಾಗ ಇಡೀ ತೆರೆಯನ್ನು ಮಂಕಾಗಿಸುತ್ತದೆ @@ -88,6 +89,7 @@ Name[ia]=Schermo Dim pro modo de administrator Name[id]=Dim Screen untuk Administrator Mode Name[is]=Dimma skjá fyrir kerfisstjóraham Name[it]=Scurisci lo schermo in modalità amministrativa +Name[ja]=管理者モードでスクリーンを暗く Name[kk]=Әкімші режімде экранды күңгірттеп көрсету Name[km]=បន្ថយ​ពន្លឺ​អេក្រង់ សម្រាប់​របៀប​ជា​អ្នក​គ្រប់គ្រង Name[kn]=ನಿರ್ವಾಹಕ ವಿಧಾನದಲ್ಲಿ (ಅ ಡ್ಮಿನಿಸ್ಟ್ರೇಟರ್ ಮೋಡ್) ತೆರೆಯನ್ನು ಮಂಕಾಗಿಸು diff --git a/effects/showpaint/showpaint_config.desktop b/effects/showpaint/showpaint_config.desktop index 437c897043..b050fcbe44 100644 --- a/effects/showpaint/showpaint_config.desktop +++ b/effects/showpaint/showpaint_config.desktop @@ -36,6 +36,7 @@ Name[ia]=Monstra pictura Name[id]=Show Paint Name[is]=Sýna teikningu Name[it]=Mostra il ridisegno +Name[ja]=描画領域を表示 Name[kk]=Бояулау Name[km]=បង្ហាញគំនូរ Name[kn]=ಕೆಪೈಂಟ್ ತೋರಿಸು