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 2018-05-18 05:45:28 +02:00
parent 309a77eedf
commit adf9cb767d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,7 @@ Name[hr]=Prijava
Name[hsb]=Přizjewjenje Name[hsb]=Přizjewjenje
Name[hu]=Bejelentkezés Name[hu]=Bejelentkezés
Name[ia]=Accesso de identification Name[ia]=Accesso de identification
Name[id]=Log Masuk Name[id]=Login
Name[is]=Innskráning Name[is]=Innskráning
Name[it]=Accesso Name[it]=Accesso
Name[ja]=ログイン Name[ja]=ログイン

2
scripts/synchronizeskipswitcher/metadata.desktop
View file

@ -16,7 +16,7 @@ Name[fr]=Synchroniser le sélecteur de fenêtres à ignorer avec la barre de tâ
Name[gl]=Sincronizar o ignorar o alternador coa barra de tarefas Name[gl]=Sincronizar o ignorar o alternador coa barra de tarefas
Name[hu]=Skip-váltó szinkronizálása a feladatsávval Name[hu]=Skip-váltó szinkronizálása a feladatsávval
Name[ia]=Synchronisa Commutator de salto con Barra de carga Name[ia]=Synchronisa Commutator de salto con Barra de carga
Name[id]=Sinkronisasi Pengganti Lewatkan dengan Bilah Tugas Name[id]=Sinkronisasi Pengganti Lewatkankan dengan Bilah Tugas
Name[it]=Sincronizza Salta barra delle applicazioni con la barra delle applicazioni Name[it]=Sincronizza Salta barra delle applicazioni con la barra delle applicazioni
Name[kk]=Терезе көрсету күйін ауыстырғышты тапсырма панелімен қадамдастыру Name[kk]=Терезе көрсету күйін ауыстырғышты тапсырма панелімен қадамдастыру
Name[km]=ធ្វើ​សមកាលម្ម​​ដោយ​រំលង​ឧបករណ៍​ប្ដូរ​​ជា​មួយ​របារ​ភារកិច្ច Name[km]=ធ្វើ​សមកាលម្ម​​ដោយ​រំលង​ឧបករណ៍​ប្ដូរ​​ជា​មួយ​របារ​ភារកិច្ច