mirror of
https://github.com/KDE/kasts.git
synced 2024-12-22 13:43:58 +01:00
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"
This commit is contained in:
parent
c6441e0c96
commit
58aeeeb172
@ -41,7 +41,7 @@ Comment[fr]=Application mobile pour podcasts
|
|||||||
Comment[gl]=Aplicación de podcasts para móbiles.
|
Comment[gl]=Aplicación de podcasts para móbiles.
|
||||||
Comment[it]=Applicazione mobile per podcast
|
Comment[it]=Applicazione mobile per podcast
|
||||||
Comment[ka]=მობილური პოდკასტის აპლიკაცია
|
Comment[ka]=მობილური პოდკასტის აპლიკაცია
|
||||||
Comment[ko]=모바일 팟캐스트 프로그램
|
Comment[ko]=모바일 팟캐스트 앱
|
||||||
Comment[nl]=Podcastprogramma voor mobiel
|
Comment[nl]=Podcastprogramma voor mobiel
|
||||||
Comment[pa]=ਮੋਬਾਈਲ ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
|
Comment[pa]=ਮੋਬਾਈਲ ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
|
||||||
Comment[pl]=Przenośna aplikacja do podkastów
|
Comment[pl]=Przenośna aplikacja do podkastów
|
||||||
@ -67,7 +67,7 @@ GenericName[fr]=Application pour podcasts
|
|||||||
GenericName[gl]=Aplicación de podcasts
|
GenericName[gl]=Aplicación de podcasts
|
||||||
GenericName[it]=Applicazione podcast
|
GenericName[it]=Applicazione podcast
|
||||||
GenericName[ka]=პოდკასტის აპლიკაცია
|
GenericName[ka]=პოდკასტის აპლიკაცია
|
||||||
GenericName[ko]=팟캐스트 프로그램
|
GenericName[ko]=팟캐스트 앱
|
||||||
GenericName[nl]=Podcastprogramma
|
GenericName[nl]=Podcastprogramma
|
||||||
GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
|
GenericName[pa]=ਪੋਡਕਾਸਟ ਐਪਲੀਕੇਸ਼ਨ
|
||||||
GenericName[pl]=Aplikacja do podkastów
|
GenericName[pl]=Aplikacja do podkastów
|
||||||
|
Loading…
Reference in New Issue
Block a user