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
1d95dd3eaf
commit
20e5fc62b1
3 changed files with 0 additions and 3 deletions
|
@ -37,7 +37,6 @@ Name[he]=טשטוש
|
|||
Name[hi]=धुंधला करें
|
||||
Name[hne]=धुंधला करव
|
||||
Name[hr]=Mrlja
|
||||
Name[hsb]=Młowojty
|
||||
Name[hu]=Elmosódás
|
||||
Name[ia]=Obscura (Blur)
|
||||
Name[id]=Buram
|
||||
|
|
|
@ -32,7 +32,6 @@ Name[he]=כניסה
|
|||
Name[hi]=लॉगइन
|
||||
Name[hne]=लागइन
|
||||
Name[hr]=Prijava
|
||||
Name[hsb]=Přizjewjenje
|
||||
Name[hu]=Bejelentkezés
|
||||
Name[ia]=Accesso de identification
|
||||
Name[id]=Login
|
||||
|
|
|
@ -34,7 +34,6 @@ Name[he]=פלסטיק
|
|||
Name[hi]=प्लास्टिक
|
||||
Name[hne]=प्लास्टिक
|
||||
Name[hr]=Plastika
|
||||
Name[hsb]=Plastik
|
||||
Name[hu]=Plastik
|
||||
Name[ia]=Plastik
|
||||
Name[id]=Plastik
|
||||
|
|
Loading…
Reference in a new issue